Attempting to keep things uniform

sqeezing into new context
Merge branch 'w_dialog'