Finishing layout & routes again