Use bootstrap grid system and fix responsive css
Merge branch 'fix'