Optimizizing OffCanvas and some changes on Flyout