Updated to fix link behaviour and make toolbar less annoying