change templates markup to improve SEO
change styles after markup changes
fix white space issues
refactoring and code cleanup
Merge remote-tracking branch 'origin/dev' into CON-1779
Merge remote-tracking branch 'origin/CON-1779' into dev