Couple of CSS improvements