Grey/blue button logic fixed