shortcode template sprint - fixes to shortcode edit page

- code cleanup
- regression fix to show options fields
- removed 'Chosen' from main selects because it seems to break the
template select option groups
renamed shortcode admin view files for consistency