Some smoothing of the experience

Hope you like the adjustments, might save you some time and give you a template for future a-mq demos.

Enjoy!