enhance admin function and pages