Issue #23853: All widgets working, still need to tweak grid