Site fixes

Gonna go ahead and merge the fixes with the master branch.