post-max storyboard reorganization
merges most recent Chuck & Erin changes