Dok/feature/sidebar fixes and events