Removed hardcoded URLs.
Still more to remove - all were removed during navigation refactor but some were put back because of flawed move to modularisation.