ConnectionController UI Changes and bug fixes

Bug fixes in map