fix button label
some work on he user setup
merge