fix sidebar menu and ordering