Fixing some issues with sidebar