Spacing adjustment
Fixing yet another user case :-/
Fixing error state after error state corrected