Ui overhaul (10/36)

Ui overhaul