Finish up Routes and Layouts