Changed up the buttons again
Fixed some of the flashing at pageload
Merge branch 'newsite' into gh-pages