Expiry selection UI fix

fixes #234