fixed widget issues