Fix state cleanup and answer list wrapping