More off canvas fixes