Lots of UI tweaks
Merge conflicts