Subscription ui

Subscription UI fixes moved to cleaned, up-to-date branch. Please merge.
Please configure your IDE so that Licence Header is at the top of the File. not after package imports.