Adding latest changes. 1. Shortname value (Jesper task), 2. Warning box dialog popups, 3. Renewal Opporunity Checkbox