Further tweaks to sidebar use