cleaned up widget, fixed various popup issues