changes to main controller, ui tweaks