More UI fixing up.