css and controller modified