couple of UI fixes