Fixed comment error
Finish layout and routes