Revamped the grenade selector

See #489