Add macros and other WYSIWYG features to the demo