Some more smal layout changes