Add some admin improvement