markup and css tweaks