Lots of UI polishing and fixes.