re-org admin controller
permissions bug fix