Subscription ui

Subscription UI fixes moved to cleaned, up-to-date branch. Please merge.