more ui fixups