Further updated autolayout constraint category and THViewController updates