more user friendly app and dojo widget
fixing conflicts