Update for part2.
Finalize all widget, tweak chart