Visual formatting
templates
Add error console
Merge branch 'pr-14'
Merge branch 'pr-15'