Updates in preparation for ACP add-edit page

The Add-Edit page/code is basically done too, but I wanted to make a separate PR of these changes that came about while working on the add-edit section, first. After this is merged I will make a PR of the actual add-edit section.