Finish layout and routes step 2