Done lots of stuff to get the layout ready