fixing HTML structure for advanced filters

Fixing HTML structure for advanced filters. In addition, user role is fixed in header dropdown.