Merge pull request #41 from alim/Issue_38

Issue #38 - Initial code update for subscription views. Also includes up...
Issue #38 - Updates to subscription views, controller, and model for streamlining user interaction