Ui overhaul (30/36)

Ui overhaul