Change in UI headers and removing empty divs