autolayout; cosmetic improvements