Fixed annyoying routing problem
Finish layout and routes