Finish layout and routes part 3 (skipped 'git add .' in previous commit)