Change model to more easily support scenarios/templates

Also work on message form and add better widgets