Improved fixed header functionality