More UI fixes...

Will this ever end?