Improve CSS formating