Template combo fixes

* Add empty text as 'No template'
* Layout fixes

This commit fixes #389
Template combo minor fix

Empty text as `Default Template`.
Merge pull request #392 from alediator/389_template_chooser_2

Template combo fixes