fix sidebar
Merge branch 'dev' into build