Subscription ui refactor rebased

Code refactoring as per peer reviews