Feature/update views for join event