For right hand side menu + bug fixes.