code restructuring for bug 2414
modified path css for automatic node creation
Merge branch 'master' into pradeep
Clean up code.  Add comment referencing Bug #2414.