fixed layout issues - found by test embed