cleanup
nav and base layout, with tests
more