Fixing hardcoded links

This is still WIP

/cc @plukacs