Update jmwhicke with small layout changes.