Attempted bug fixing
Merge branch 'master' of https://github.com/asassu/wonderspot
Merge branch 'master' of https://github.com/asassu/wonderspot
Styling and moving links around