Merge pull request #39 from pkiran/master

Code Re-factoring in ServiceControllers
widget code re-factoring.