HS - fixed the button issues