Implemented 5.3
5.3.2 implemented
Finish layout and routes