more controller and view tweaks