Adjusted routing and added links