XX-10947 - optimization of html and css based on code review