Made the factor screen work with the recently simplified state transitions, see #63, see #107.  Also made the not equals sign behave correctly for this screen, see #110.