Attempting to fix some performance issues with sidebar