Updated fix to close drawer on page or menu click