adding basic nav and cleaning things up