Adding a menu-based sorting of pumps based on distance, priority, and last update.

Rebasing shine's latest on top of Kasia's