Screen linking updates.

Linked screens in more places for better user experience.
Updates to the Map Screen.

Updates to the Map Screen.
Fix error in map screen.

Fix error in map screen.