Pre-demo checkin point, UI working well enough and now externally configurable
Some cleanup and addition of template properties