Revert "Revert "UI overhaul""

This reverts commit bf21c05157eb9a87817b60c7ca464ad5e5b225fb.
revert the revert