A few layout and lang changes