Progress on pedigree choosing, updates to basic layout