Fixed autolayout bugs