Fix some layout changes. Autolayout warnings still persist though.