Converted to ARC, started translation to Autolayout