Updated with autolayout category on THViewController