Bug Fixes

Going through the site QAing. Lot's of small changes made and a bit of
cleaning up