Headers Cleanup & Responsiveness