UI changes and general fixes.