Finish Layout and Adding Routes and shit