add bucket management and fix user list