Added link on route-click and re-wrote some structure