WIP - fixing sidebar collapse