Migrated output entries to their own template; misc. refactoring