Fixed widget issues with save