Cleaned up reset mechanism.

This fixes the issue where we ended up with two layouts when the state
was loaded.