bunch of UI fixes