fix widget
fix menu