Some styling work
Lots of UI improvements