Auto layout corrections, minor UI changes