Auto layout

updated auto layout