Widget code Re-factoring

Widget names re-factored. Like widget issues resolved. Style issues fixed for widgets.