More autolayout tweaks