Fix stuff to work with autolayout properly