Moving temp float: left to JS; some code formatting
Merge branch 'master' into gh-pages