Clean up, change header visibility settings