Rework the Forms part in the admin settings