Lots of UI work #7