Improve CSS further