Fixing to work on autolayout issues