Removed header and footer and fixed a bug

Corrected the highlighted classes