Add a navigation system for future use
Finalize connection and disconnection

Use the new navigation system to handle closings of the main window