Auto layout and UI improvements