diff --git a/release/scripts/ui/space_graph.py b/release/scripts/ui/space_graph.py
new file mode 100644
index 00000000000..bc1e2c5334b
--- /dev/null
+++ b/release/scripts/ui/space_graph.py
@@ -0,0 +1,189 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+import bpy
+
+
+class GRAPH_HT_header(bpy.types.Header):
+    bl_space_type = 'GRAPH_EDITOR'
+
+    def draw(self, context):
+        layout = self.layout
+
+        st = context.space_data
+
+        row = layout.row(align=True)
+        row.template_header()
+
+        if context.area.show_menus:
+            sub = row.row(align=True)
+            
+            sub.menu("GRAPH_MT_view")
+            sub.menu("GRAPH_MT_select")
+            sub.menu("GRAPH_MT_channel")
+            sub.menu("GRAPH_MT_key")
+            
+        layout.prop(st, "mode", text="")
+        
+        layout.template_dopesheet_filter(st.dopesheet)
+        
+        layout.prop(st, "autosnap", text="")
+        layout.prop(st, "pivot_point", text="", icon_only=True)
+        
+        row = layout.row(align=True)
+        row.operator("graph.copy", text="", icon='ICON_COPYDOWN')
+        row.operator("graph.paste", text="", icon='ICON_PASTEDOWN')
+        
+        row = layout.row(align=True)
+        # these likely need new icons
+        row.operator("graph.ghost_curves_create", text="", icon='ICON_GHOST_ENABLED')
+        row.operator("graph.ghost_curves_clear", text="", icon='ICON_GHOST_DISABLED')
+
+
+class GRAPH_MT_view(bpy.types.Menu):
+    bl_label = "View"
+
+    def draw(self, context):
+        layout = self.layout
+
+        st = context.space_data
+
+        layout.column()
+
+        layout.separator()
+        layout.operator("graph.properties")
+
+        layout.prop(st, "show_cframe_indicator")
+        layout.prop(st, "show_cursor")
+        layout.prop(st, "show_sliders")
+        layout.prop(st, "automerge_keyframes")
+        
+        layout.separator()
+        layout.operator("graph.handles_view_toggle")
+        layout.prop(st, "only_selected_curves_handles")
+        layout.prop(st, "only_selected_keyframe_handles")
+        layout.operator("anim.time_toggle")
+        
+        layout.separator()
+        layout.operator("anim.previewrange_set")
+        layout.operator("anim.previewrange_clear")
+        layout.operator("graph.previewrange_set")
+
+        layout.separator()
+        layout.operator("graph.frame_jump")
+        layout.operator("graph.view_all")
+        
+        layout.separator()
+        layout.operator("screen.area_dupli")
+        layout.operator("screen.screen_full_area")
+
+class GRAPH_MT_select(bpy.types.Menu):
+    bl_label = "Select"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.column()
+        # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
+        layout.operator("graph.select_all_toggle")
+        layout.operator("graph.select_all_toggle", text="Invert Selection").invert = True
+        
+        layout.separator()
+        layout.operator("graph.select_border")
+        layout.operator("graph.select_border", text="Border Axis Range").axis_range = True
+        
+        layout.separator()
+        layout.operator("graph.select_column", text="Columns on Selected Keys").mode = 'KEYS'
+        layout.operator("graph.select_column", text="Column on Current Frame").mode = 'CFRA'
+        
+        layout.operator("graph.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
+        layout.operator("graph.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
+
+class GRAPH_MT_channel(bpy.types.Menu):
+    bl_label = "Channel"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.column()
+        layout.operator("anim.channels_setting_toggle")
+        layout.operator("anim.channels_setting_enable")
+        layout.operator("anim.channels_setting_disable")
+        
+        layout.separator()
+        layout.operator("anim.channels_editable_toggle")
+        
+        layout.separator()
+        layout.operator("anim.channels_expand")
+        layout.operator("anim.channels_collapse")
+        
+class GRAPH_MT_key(bpy.types.Menu):
+    bl_label = "Key"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.column()
+        layout.menu("GRAPH_MT_key_transform", text="Transform")
+        
+        layout.operator_menu_enum("graph.snap", property="type", text="Snap")
+        layout.operator_menu_enum("graph.mirror", property="type", text="Mirror")
+        
+        layout.separator()
+        layout.operator("graph.keyframe_insert")
+        layout.operator("graph.fmodifier_add")
+        
+        layout.separator()
+        layout.operator("graph.duplicate")
+        layout.operator("graph.delete")
+        
+        layout.separator()
+        layout.operator_menu_enum("graph.handle_type", property="type", text="Handle Type")
+        layout.operator_menu_enum("graph.interpolation_type", property="type", text="Interpolation Mode")
+        layout.operator_menu_enum("graph.extrapolation_type", property="type", text="Extrapolation Mode")
+        
+        layout.separator()
+        layout.operator("graph.clean")
+        layout.operator("graph.sample")
+        layout.operator("graph.bake")
+        
+        layout.separator()
+        layout.operator("graph.copy")
+        layout.operator("graph.paste")
+        
+class GRAPH_MT_key_transform(bpy.types.Menu):
+    bl_label = "Transform"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.column()
+        layout.operator("tfm.translate", text="Grab/Move")
+        layout.operator("tfm.transform", text="Extend").mode = 'TIME_EXTEND'
+        layout.operator("tfm.rotate", text="Rotate")
+        layout.operator("tfm.resize", text="Scale")
+        
+
+bpy.types.register(GRAPH_HT_header) # header/menu classes
+bpy.types.register(GRAPH_MT_view)
+bpy.types.register(GRAPH_MT_select)
+bpy.types.register(GRAPH_MT_channel)
+bpy.types.register(GRAPH_MT_key)
+bpy.types.register(GRAPH_MT_key_transform)
+
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 608954eeed8..aed1e5d5f0d 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -636,6 +636,7 @@ uiBlock *uiLayoutAbsoluteBlock(uiLayout *layout);
 
 /* templates */
 void uiTemplateHeader(uiLayout *layout, struct bContext *C, int menus);
+void uiTemplateDopeSheetFilter(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);
 void uiTemplateID(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname,
 	char *newop, char *openop, char *unlinkop);
 void uiTemplateAnyID(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, 
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 9402da2f2c6..bb893294910 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -60,12 +60,58 @@ void ui_template_fix_linking()
 void uiTemplateHeader(uiLayout *layout, bContext *C, int menus)
 {
 	uiBlock *block;
-	
+
 	block= uiLayoutAbsoluteBlock(layout);
 	if(menus) ED_area_header_standardbuttons(C, block, 0);
 	else ED_area_header_switchbutton(C, block, 0);
 }
 
+/********************** DopeSheet Filter Template *************************/
+
+void uiTemplateDopeSheetFilter(uiLayout *layout, bContext *C, PointerRNA *ptr)
+{
+	Main *mainptr= CTX_data_main(C);
+	ScrArea *sa= CTX_wm_area(C);
+	uiLayout *row= layout;
+	short nlaActive= ((sa) && (sa->spacetype==SPACE_NLA));
+
+	/* more 'generic' filtering options */
+	if (nlaActive)
+		row= uiLayoutRow(layout, 1);
+
+	uiItemR(row, "", 0, ptr, "only_selected", 0);
+
+	if (nlaActive)
+		uiItemR(row, "", 0, ptr, "include_missing_nla", 0);
+
+	if (nlaActive)
+		row= layout;
+
+	/* datatype based - only available datatypes are shown */
+	row= uiLayoutRow(layout, 1);
+
+	uiItemR(row, "", 0, ptr, "display_scene", 0);
+	uiItemR(row, "", 0, ptr, "display_world", 0);
+	uiItemR(row, "", 0, ptr, "display_node", 0);
+
+	if (mainptr && mainptr->key.first)
+		uiItemR(row, "", 0, ptr, "display_shapekeys", 0);
+	if (mainptr && mainptr->mat.first)
+		uiItemR(row, "", 0, ptr, "display_material", 0);
+	if (mainptr && mainptr->lamp.first)
+		uiItemR(row, "", 0, ptr, "display_lamp", 0);
+	if (mainptr && mainptr->camera.first)
+		uiItemR(row, "", 0, ptr, "display_camera", 0);
+	if (mainptr && mainptr->curve.first)
+		uiItemR(row, "", 0, ptr, "display_curve", 0);
+	if (mainptr && mainptr->mball.first)
+		uiItemR(row, "", 0, ptr, "display_metaball", 0);
+	if (mainptr && mainptr->armature.first)
+		uiItemR(row, "", 0, ptr, "display_armature", 0);
+	if (mainptr && mainptr->particle.first)
+		uiItemR(row, "", 0, ptr, "display_particle", 0);
+}
+
 /********************** Search Callbacks *************************/
 
 typedef struct TemplateID {
diff --git a/source/blender/editors/space_graph/graph_header.c b/source/blender/editors/space_graph/graph_header.c
index bf8777164c5..8aeb76cae0f 100644
--- a/source/blender/editors/space_graph/graph_header.c
+++ b/source/blender/editors/space_graph/graph_header.c
@@ -63,144 +63,6 @@
 #include "graph_intern.h"
 
 /* ********************************************************* */
-/* Menu Defines... */
-
-static void graph_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	bScreen *sc= CTX_wm_screen(C);
-	ScrArea *sa= CTX_wm_area(C);
-	SpaceIpo *sipo= CTX_wm_space_graph(C);
-	PointerRNA spaceptr;
-	
-	/* retrieve state */
-	RNA_pointer_create(&sc->id, &RNA_SpaceGraphEditor, sipo, &spaceptr);
-	
-	/* create menu */
-	uiItemO(layout, NULL, ICON_MENU_PANEL, "GRAPH_OT_properties");
-	
-	uiItemS(layout);
-	
-	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0);
-	uiItemR(layout, NULL, 0, &spaceptr, "show_cursor", 0);
-	uiItemR(layout, NULL, 0, &spaceptr, "show_sliders", 0);
-	uiItemR(layout, NULL, 0, &spaceptr, "automerge_keyframes", 0);
-	
-	if (sipo->flag & SIPO_NOHANDLES)
-		uiItemO(layout, "Show Handles", ICON_CHECKBOX_DEHLT, "GRAPH_OT_handles_view_toggle");
-	else
-		uiItemO(layout, "Show Handles", ICON_CHECKBOX_HLT, "GRAPH_OT_handles_view_toggle");
-	
-	uiItemR(layout, NULL, 0, &spaceptr, "only_selected_curves_handles", 0);
-	uiItemR(layout, NULL, 0, &spaceptr, "only_selected_keyframe_handles", 0);
-	
-	
-	if (sipo->flag & SIPO_DRAWTIME)
-		uiItemO(layout, "Show Frames", 0, "ANIM_OT_time_toggle");
-	else
-		uiItemO(layout, "Show Seconds", 0, "ANIM_OT_time_toggle");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_set");
-	uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_clear");
-	
-	uiItemO(layout, NULL, 0, "GRAPH_OT_previewrange_set");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "GRAPH_OT_frame_jump");
-	
-	uiItemO(layout, NULL, 0, "GRAPH_OT_view_all");
-	
-	if (sa->full) 
-		uiItemO(layout, NULL, 0, "SCREEN_OT_screen_full_area"); // "Tile Window", Ctrl UpArrow
-	else 
-		uiItemO(layout, NULL, 0, "SCREEN_OT_screen_full_area"); // "Maximize Window", Ctrl DownArrow
-}
-
-static void graph_selectmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "GRAPH_OT_select_all_toggle");
-	uiItemBooleanO(layout, "Invert All", 0, "GRAPH_OT_select_all_toggle", "invert", 1);
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "GRAPH_OT_select_border");
-	uiItemBooleanO(layout, "Border Axis Range", 0, "GRAPH_OT_select_border", "axis_range", 1);
-	
-	uiItemS(layout);
-	
-	uiItemEnumO(layout, "Columns on Selected Keys", 0, "GRAPH_OT_select_column", "mode", GRAPHKEYS_COLUMNSEL_KEYS);
-	uiItemEnumO(layout, "Column on Current Frame", 0, "GRAPH_OT_select_column", "mode", GRAPHKEYS_COLUMNSEL_CFRA);
-	
-	uiItemEnumO(layout, "Columns on Selected Markers", 0, "GRAPH_OT_select_column", "mode", GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN);
-	uiItemEnumO(layout, "Between Selected Markers", 0, "GRAPH_OT_select_column", "mode", GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN);
-}
-
-static void graph_channelmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_setting_toggle");
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_setting_enable");
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_setting_disable");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_editable_toggle");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_expand");
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_collapse");
-}
-
-static void graph_edit_transformmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, "Grab/Move", 0, "TFM_OT_translate");
-	uiItemEnumO(layout, "Extend", 0, "TFM_OT_transform", "mode", TFM_TIME_EXTEND);
-	uiItemO(layout, "Rotate", 0, "TFM_OT_rotate");
-	uiItemO(layout, "Scale", 0, "TFM_OT_resize");
-}
-
-static void graph_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemMenuF(layout, "Transform", 0, graph_edit_transformmenu, NULL);
-	uiItemMenuEnumO(layout, "Snap", 0, "GRAPH_OT_snap", "type");
-	uiItemMenuEnumO(layout, "Mirror", 0, "GRAPH_OT_mirror", "type");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "GRAPH_OT_keyframe_insert");
-	uiItemO(layout, NULL, 0, "GRAPH_OT_fmodifier_add");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "GRAPH_OT_duplicate");
-	uiItemO(layout, NULL, 0, "GRAPH_OT_delete");
-	
-	uiItemS(layout);
-	
-	uiItemMenuEnumO(layout, "Handle Type", 0, "GRAPH_OT_handle_type", "type");
-	uiItemMenuEnumO(layout, "Interpolation Mode", 0, "GRAPH_OT_interpolation_type", "type");
-	uiItemMenuEnumO(layout, "Extrapolation Mode", 0, "GRAPH_OT_extrapolation_type", "type");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "GRAPH_OT_clean");
-	uiItemO(layout, NULL, 0, "GRAPH_OT_sample");
-	uiItemO(layout, NULL, 0, "GRAPH_OT_bake");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "GRAPH_OT_copy");
-	uiItemO(layout, NULL, 0, "GRAPH_OT_paste");
-}
-
-/* ********************************************************* */
-
-enum {
-	B_REDR = 0,
-	B_MODECHANGE,
-} eGraphEdit_Events;
 
 static void do_graph_buttons(bContext *C, void *arg, int event)
 {
@@ -208,104 +70,4 @@ static void do_graph_buttons(bContext *C, void *arg, int event)
 	ED_area_tag_redraw(CTX_wm_area(C));
 }
 
-static char *garound_pup(const bContext *C)
-{
-	static char string[512];
-	char *str = string;
-
-	str += sprintf(str, "%s", "Pivot: %t"); 
-	str += sprintf(str, "%s", "|Bounding Box Center %x0"); 
-	//str += sprintf(str, "%s", "|Median Point %x3");
-	str += sprintf(str, "%s", "|2D Cursor %x1");
-	str += sprintf(str, "%s", "|Individual Centers %x2");
-	return string;
-}
-
-void graph_header_buttons(const bContext *C, ARegion *ar)
-{
-	SpaceIpo *sipo= CTX_wm_space_graph(C);
-	ScrArea *sa= CTX_wm_area(C);
-	uiBlock *block;
-	int xco, yco= 3;
-	
-	block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
-	uiBlockSetHandleFunc(block, do_graph_buttons, NULL);
-	
-	/* standard buttosn in header - viewtype selector and menus */
-	xco= ED_area_header_standardbuttons(C, block, yco);
-	
-	if ((sa->flag & HEADER_NO_PULLDOWN)==0) {
-		int xmax;
-		
-		xmax= GetButStringLength("View");
-		uiDefMenuBut(block, graph_viewmenu, NULL, "View", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		xmax= GetButStringLength("Select");
-		uiDefMenuBut(block, graph_selectmenu, NULL, "Select", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		xmax= GetButStringLength("Channel");
-		uiDefMenuBut(block, graph_channelmenu, NULL, "Channel", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		xmax= GetButStringLength("Key");
-		uiDefMenuBut(block, graph_editmenu, NULL, "Key", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-	}
-	
-	uiBlockSetEmboss(block, UI_EMBOSS);
-	
-	/* mode selector */
-	uiDefButS(block, MENU, B_MODECHANGE, 
-			"Editor Mode %t|F-Curve Editor %x0|Drivers %x1", 
-			xco,yco,110,YIC, &sipo->mode, 0, 1, 0, 0, 
-			"Editing modes for this editor");
-	xco+= 120;
-	
-	/* filtering buttons */
-	xco= ANIM_headerUI_standard_buttons(C, sipo->ads, block, xco, yco);
-	
-	/* auto-snap selector */
-	if (sipo->flag & SIPO_DRAWTIME) {
-		uiDefButS(block, MENU, B_REDR,
-				"Auto-Snap Keyframes %t|No Time-Snap %x0|Nearest Second %x2|Nearest Marker %x3", 
-				xco,yco,90,YIC, &sipo->autosnap, 0, 1, 0, 0, 
-				"Auto-snapping mode for keyframe times when transforming");
-	}
-	else {
-		uiDefButS(block, MENU, B_REDR, 
-				"Auto-Snap Keyframes %t|No Time-Snap %x0|Nearest Frame %x2|Nearest Marker %x3", 
-				xco,yco,90,YIC, &sipo->autosnap, 0, 1, 0, 0, 
-				"Auto-snapping mode for keyframe times when transforming");
-	}
-	xco += 98;
-	
-	/* pivot mode setting */
-	uiDefIconTextButI(block, ICONTEXTROW,B_REDR, ICON_ROTATE, garound_pup(C), xco,yco,XIC+10,YIC, &(sipo->around), 0, 3.0, 0, 0, "Rotation/Scaling Pivot");
-	xco+= XIC+10;
-	
-	/* copy + paste */
-	uiBlockBeginAlign(block);
-		uiDefIconButO(block, BUT, "GRAPH_OT_copy", WM_OP_INVOKE_REGION_WIN, ICON_COPYDOWN, xco+=XIC,yco,XIC,YIC, "Copies the selected keyframes from the selected channel(s) to the buffer");
-		uiDefIconButO(block, BUT, "GRAPH_OT_paste", WM_OP_INVOKE_REGION_WIN, ICON_PASTEDOWN, xco+=XIC,yco,XIC,YIC, "Pastes the keyframes from the buffer");
-	uiBlockEndAlign(block);
-	xco += (XIC + 8);
-	
-	/* ghost curves */
-	// XXX these icons need to be changed
-	if (sipo->ghostCurves.first)
-		uiDefIconButO(block, BUT, "GRAPH_OT_ghost_curves_clear", WM_OP_INVOKE_REGION_WIN, ICON_GHOST_DISABLED, xco,yco,XIC,YIC, "Clear F-Curve snapshots (Ghosts) for this Graph Editor instance");
-	else 
-		uiDefIconButO(block, BUT, "GRAPH_OT_ghost_curves_create", WM_OP_INVOKE_REGION_WIN, ICON_GHOST_ENABLED, xco,yco,XIC,YIC, "Create snapshot (Ghosts) of selected F-Curves as background aid for this Graph Editor instance");
-	xco+= XIC;
-	
-	
-	/* always as last  */
-	UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, (int)(ar->v2d.tot.ymax - ar->v2d.tot.ymin));
-	
-	uiEndBlock(C, block);
-	uiDrawBlock(C, block);
-}
-
 
diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c
index 24f87906391..f6d25bd7285 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -350,29 +350,12 @@ static void graph_channel_area_draw(const bContext *C, ARegion *ar)
 /* add handlers, stuff you only do once or on area/region changes */
 static void graph_header_area_init(wmWindowManager *wm, ARegion *ar)
 {
-	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_HEADER, ar->winx, ar->winy);
+	ED_region_header_init(ar);
 }
 
 static void graph_header_area_draw(const bContext *C, ARegion *ar)
 {
-	float col[3];
-	
-	/* clear */
-	if(ED_screen_area_active(C))
-		UI_GetThemeColor3fv(TH_HEADER, col);
-	else
-		UI_GetThemeColor3fv(TH_HEADERDESEL, col);
-	
-	glClearColor(col[0], col[1], col[2], 0.0);
-	glClear(GL_COLOR_BUFFER_BIT);
-	
-	/* set view2d view matrix for scrolling (without scrollers) */
-	UI_view2d_view_ortho(C, &ar->v2d);
-	
-	graph_header_buttons(C, ar);
-	
-	/* restore view matrix? */
-	UI_view2d_view_restore(C);
+	ED_region_header(C, ar);
 }
 
 /* add handlers, stuff you only do once or on area/region changes */
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index e15cc130899..6086cdfdec2 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -254,6 +254,11 @@ void RNA_api_ui_layout(StructRNA *srna)
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 	RNA_def_boolean(func, "menus", 1, "", "The header has menus, and should show menu expander.");
 
+	func= RNA_def_function(srna, "template_dopesheet_filter", "uiTemplateDopeSheetFilter");
+	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
+	parm= RNA_def_pointer(func, "dopesheet", "DopeSheet", "", "DopeSheet settings holding filter options.");
+	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR|PROP_NEVER_NULL);
+
 	func= RNA_def_function(srna, "template_ID", "uiTemplateID");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 	api_ui_item_rna_common(func);