Moved admin pages to admin namespace and tidied up form parameters