Code cleanup.
UI fixes.