Minor fixes to buttons/labels