some last layout changes