Minor theming and UI work