A couple of UI fixes and clean ups