Further CSS improvements