Users all and incomplete buttons fixed