Changed some button text and other cosmetics
Some minor cosmetic improvements
More minor cosmetic improvements