made template changes for responsive fixes
Merge branch 'develop'