Simplify CSS, and reduce header space slightly if not much space

Change-Id: Ieeb25d3fcdea1c918c47d0750ec01bbf2d819e84