Fixed a bug of button label not properly changing.

Also did some UI tweaks