label and button improvements