some changes to move over to sidebar-style