JAL-3026-JAL-3063 fix for panel layout failure