Some controllers and UI tweaks