Finish layout nd routes2