some more autolayout polish