Cleanup
Added H1
Added template part