Initial fixes for the latest layout revision.