Add a helper
Finish layout and routes