Adding css file
Did some more file cleanup
Fixed bugs
Merge branch 'master' into gh-pages