Finish my layout and routes