Review by care: Added @todo's to the administration forms
Review by core: Moved administration form file into includes and renamed it