improved admin form