Ui overhaul (34/36)

Ui overhaul