update gallery
update
returnt value in fatal case
updated responsive design
Merge branch 'template_refactoring'
resolve merge conflicts