x-cell bug fix & screen event fix in ExpandedEvents