More CSS improvements