Updated Map design