Fixed issues with autolayout