Updated custom route names
Finish layout and routes