[#53022305] Replaced grid layout with box layout to better control widget removal, and allow calenders to be properly wired.