UI work and bug fixes.