Improve the quality of the two gadgets (labeling, styling, etc...)