More UI fixing.