Ui overhaul next last improvements