Merge "Misc clean up. move widgets from graph to widget package."