Milestone 6

merge in IE fix for header