Minor architecture changes. Added forms to manage subscription plans.