Temporarily the autolayout is weird right now. Will fix later
Some clean up on the compose view