Finish layout and routes2