Finish layout and routes...again