updated route 5.23
Finish layout and routes