More layout changes. It's layout time.