fix menu and headers for IE8
fix merge conflict