Fix couple of CSS bugs