more work on admin forms