tweaks to scaffoldWidget.
Merge pull request #40 from ramnathv/refactor/scaffold

tweaks to scaffoldWidget.