Again, more code cleanup. Header and footer are now directives. Yay.