Ui overhaul (20/36)

Ui overhaul