Final fixes. Some table layout tweaks.