further updated auto layout