additional changes #36, button functionality