Website update

fixing issues on the website, want to merge in the db changes asap