Wip/new sidebar