Clean subscription ui

Corrupt pull request "subscription_ui" moved to cleaned branch . please merge.
Refer to above comment ( about exceptions)