Finish layout and routes
Updated finish with layout