Buttons issue appears to be solved.