fixed auto layout issues