Modified table layout