Fixed header and footer alighmneti ssues.
Merge