Lots and Lots of UI changes and additions