Changes for the navigation and message boxes