Fixed Autolayout...and testing my noob git skills