Offcanvas fix and interchange DI