Some layout changes that weren't committed.