Fix more layout issues