adding removeSidebar / improves menu handling