Clean subscription ui

Corrupt pull request "subscription_ui" moved to cleaned branch . please merge.
How about a comment to explain whats going on here?