Further additions to GUI  - MapWindow