Add remaining modals and separate admin methods