Fix more some layout errors