Small change to make dynamic-dialog.@id expand for use with extensions to make the id unique
Improve how screen-include is handled so that it is rendered more in the context of the current screen instead of totally independently