Fixes clearing issue and small off-canvas fix. Close #342