fix empty option new activity form
refactor controllers