Some minor CSS and markup cleanup