lots of UI bugs squashed