added some auto lay out fix