A few changes to #606
Merge pull request #607 from mozilla-appmaker/secretrobotron-designer-index-progress

A few changes to #606