Ui overhaul (15/36)

Ui overhaul