enhance auto layout