WIP Add sidebar support