Prod sidebar

Improve the sidebar handle on production module