Changes to custommapview and messages fix for account selection