Fix more layout errors