lots of UI changes