improved html markup and css