Template combo fixes

* Add empty text as 'No template'
* Layout fixes

This commit fixes #389