massive changes ;-) in css, controllers and views