Add better routing
Finish layout and routes