Fix controller events and elements