Better output formatting and simpler template files