Some layout changes and commenting.