Finish Layout and routes
git checkout master