Make the widgets more optimized