Yet another sidebar rework