Fix new record bug (not set to edit) + renamed controllers