css changes
Fixed merge issues