Watch layout too
Header and footer in layout
Finished porting old cv, both yaml and template