Finish layout and routes
add layouts and routes