responsive on 960px 768px
Merge branch 'refactor'