Agree on both. Current location and the one-off entry button should be distinct from the preset buttons.

I love the simple but powerful UI. It's not often you see something that makes you think "Why hasn't this been done before?".

I would even gladly pay a buck or two for an Android version ;)

EDIT: grammar