all navigations working
Merging Branch