Finish Layout and routes. Refactor specs