Initial layout changes; more to come.