Working on navigation and sundry functions