The coffee giant will also bring back self-service condiments and free refills for in-store customers