add minor auto layout improvements