fixed some autoLayout issues