fix auto layout issues