Fixed issues with sidebar