update/organize css
update template structure and css