html structure and css improvements