Updates to subscription UI and two fixes.