Resolved issue with Autolayout