Fix modal / sidebar incompatibilities