layout: tidy up and add members.