lots of UI fixes