Lots of final UI changes