Includes visual correctness during submit in progress, fixes #14