URI's changed to x_path
Finish layout and routes