Fixing some more things, changing links to buttons.