More layout cleanup.