Move topbar into partial