- major markup, template and css refactor and cleanup