Button and label improvements