Cleaned up flow and expiry time display during shopping.