Clean up markup and css

Change-Id: Ie39ca9d0c6317c01b7b8fc1e1044907f790f0c9e