Improve CSS layout