All my navigation branch changes Here.

Don't merge it as of now. I can push more UI changes on the navigation branch. 

Thanks!