More layout tuning, table layout tuning too.