improved helper
Finish layout and routes