Fixed buttons and links that were broken.
Merge branch 'fixbrokenstuff' into develop