Finish layout and rouates for real