Working on off-canvas
Implementing off-canvas
stashing
Fixing merge errors