fixed some website stuff
Merge branch 'fixing-tables'