basic nav working
some other changes