Improve CSS (not finished)