Add more advanced stats, change injected template layout