Layout and readme changes as requested by Bob.