Added changes to navigate between views