wip
fix sidebar