some markup and css cleanup