Issue #38 - Initial code update for subscription views. Also includes up...

...dates to Subscription controllers and model