improve widgets
