Revert "close keyboard on button click"

This reverts commit 556b76a9b44ad6c6f8dc0ee1aed88bd778cf75e8.
Revert "Revert "close keyboard on button click""

This reverts commit c780b97a84b02c277ddfdf76f9a002e414f81038.
Map Bug Fix
Map Bug fix