added-formatting
Finish layout and routes