Merge branch 'gh-pages'
modified UI a little
Merge branch 'master' into gh-pages