controller fixes, css fixes