new changes to button layout etc
condition labels and buttons