Sorted some epic site bugs

This closes a bunch of long running issues!