Iss 161 fix sidebar