refactor organization of html tags and css selectors