Fixes #7 (and revert number keyboard for PINs)