form treatment + header/footer fix
Merge branch 'dwayne-tweaks'