Navigation button function updated and code cleanup
Navigation button change and code cleanup