Template display fixes
Runner robustness (again)
Fix #187
Merge branch 'hotfix/1.5.1'