More auto layout improvements.