Fixes issues with the sidebar

fixes:
#2464
#2459 
#2458