Just before I mess with nested partial layouts...