Fixing errors in CSS, whitespace changes in index.html
Merge changes from master branch