Fixes, stretch grid panel improvements