updated button functionality to work on Enter

pulled "updated button functionality to work on Enter" from master