Bug Fixes for widget