fixed auto-layout issues