Moved the titlebar into its own directive again.