Fixing a few site changes

I did not manage to split the pull request so you probably have to reject two changes and just accept the latest change.