Fixed up widget, works correctly now