Tweak controllers, tweak views, minor CSS cleanups