Added wait for buttons block implementation