3rd attempt to fix sidebar issues in ui