responsive fixes
responsive part done
Merge branch 'issue-32' into develop