Fixes #5533 fixes issues with widget layout - Refs #5529