#257 - improvements for sidebar