working on style and simplifying tests
finish layouts and routes