Add some tweaks for non-custom sidebar