Updated css views
Fixed merge conflicts