Resolve auto layout issues