Modified table layout slightly.
Merge remote branch 'origin/master'