Responsivness fixed, remove html error from index
Merge origin/master