Fixing autolayout issues, starting on compose