state changes and cleanup
Updated with UI imagery
Merge branch 'images' into feature-state-machine