fix event show view
Merge branch 'master' into add-confirmation-email
add default to active