Tidied imports in SidebarController