Fixed some autolayout issues in demo project