Fix more solid layout stuff