Simplified Navigation Calls & Added Popup & Popdown