NavigationBar implemented , buggy
Merging navBar branch