Removed need for JS, fixed issue with enter vs. click button