Proposal Submission Form CMS Box should discriminate by Proposal Kind/Type

Fixes #134 

* Modify the naming schema of the CMS Box to be explicit for each ProposalKind.