Updated with proper header/footer alignment