working update on navigation view, working on incorporating buttons and ...

...labels now